Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 30 Aug 2010 06:09:18 +0000 (06:09 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 30 Aug 2010 06:09:18 +0000 (06:09 +0000)

Trivial merge